Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 29 Aug 2011 17:13:29 +0000 (10:13 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 29 Aug 2011 17:13:29 +0000 (10:13 -0700)

Trivial merge